From 1e165879010a3563c377e3d7b480c048e5f58fa1 Mon Sep 17 00:00:00 2001
From: Kristian Rietveld <kristian@src.gnome.org>
Date: Sun, 24 Dec 2006 19:32:38 +0000
Subject: [PATCH] Remove stale cvs conflict marker.

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0a0f26400e..6b8fff34ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,7 +80,6 @@
 	for replacing the selection via DND or copy-and-paste.
 	(#64998, Damon Chaplin, Sven Herzberg)
 
->>>>>>> 1.8517
 2006-12-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkimmulticontext.c: Be careful to not override
-- 
2.30.2